Adwaita: sync sidebar color vars.
authorLapo Calamandrei <calamandrei@gmail.com>
Wed, 2 Sep 2015 10:05:22 +0000 (12:05 +0200)
committerLapo Calamandrei <calamandrei@gmail.com>
Wed, 2 Sep 2015 10:06:49 +0000 (12:06 +0200)
gtk/theme/Adwaita/_colors.scss
gtk/theme/Adwaita/_common.scss
gtk/theme/Adwaita/gtk-contained-dark.css
gtk/theme/Adwaita/gtk-contained.css

index 1479064ecd3e336e8d6697758ee5f9fee4d2b093..52ca0a93dcd0cd68059d685b57fe6783a53ce926 100644 (file)
@@ -30,7 +30,7 @@ $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_col
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
 
-$sidebar_bg_color: lighten($bg_color, 2%);
+$sidebar_bg_color: mix($bg_color, $base_color, 50%);
 
 $tooltip_borders_color: transparentize(white, 0.9);
 
@@ -48,6 +48,6 @@ $backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color,
 $backdrop_selected_fg_color: $selected_fg_color;
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
-$backdrop_sidebar_bg_color: lighten($backdrop_bg_color, 2%);
+$backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%);
 
 $backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%);
index 8abf21a63983d8f1a017a60df0e886cf88da1079..eb7e414344de53ef12bc8c69877df0ed6040a81c 100644 (file)
@@ -2882,7 +2882,6 @@ GtkFileChooserDialog {
 
 .sidebar {
   border: none;
-  // Popover background color
   background-color: mix($bg_color, $base_color, 50%);
 
   &:backdrop {
index 553d4a8fe74d669ec2d06f1c0aabdc41a007f5bb..e6685db5461bb07ff25d0114a7e375f1717445c0 100644 (file)
@@ -3946,7 +3946,7 @@ GtkFileChooserDialog .dialog-action-box {
   border: none;
   background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #3e4444; }
+    background-color: #333636; }
 
 GtkSidebarRow.list-row {
   padding: 0px; }
index b9cf139d47474ade01d8efb480286ae5a199bed0..86ebc217ce044d20c32870bf8b178025e02cc9a2 100644 (file)
@@ -4118,7 +4118,7 @@ GtkFileChooserDialog .dialog-action-box {
   border: none;
   background-color: #f6f6f6; }
   .sidebar:backdrop {
-    background-color: #f2f2f2; }
+    background-color: #f6f6f6; }
 
 GtkSidebarRow.list-row {
   padding: 0px; }